Don't emit grab-broken for overgrabbing, until we figure out how to do

2005-06-25  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkmain-x11.c (gdk_keyboard_grab, gdk_pointer_grab):
	Don't emit grab-broken for overgrabbing, until we figure
	out how to do that without breaking the menu code.

diff --git a/ChangeLog b/ChangeLog
index c4bdfc1c27288ff65285bb5617c38852a948fb20..2be9a86313c7de4c306843f15a709f5b6c58dbd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (gdk_keyboard_grab, gdk_pointer_grab):
+       Don't emit grab-broken for overgrabbing, until we figure
+       out how to do that without breaking the menu code.
+
 2005-06-25  Matthias Clasen  <mclasen@redhat.com>
 
        Add a GrabBroken event to GDK, and a grab-broken-event

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c4bdfc1c27288ff65285bb5617c38852a948fb20..2be9a86313c7de4c306843f15a709f5b6c58dbd9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-06-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (gdk_keyboard_grab, gdk_pointer_grab):
+       Don't emit grab-broken for overgrabbing, until we figure
+       out how to do that without breaking the menu code.
+
 2005-06-25  Matthias Clasen  <mclasen@redhat.com>
 
        Add a GrabBroken event to GDK, and a grab-broken-event

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c4bdfc1c27288ff65285bb5617c38852a948fb20..2be9a86313c7de4c306843f15a709f5b6c58dbd9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-06-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (gdk_keyboard_grab, gdk_pointer_grab):
+       Don't emit grab-broken for overgrabbing, until we figure
+       out how to do that without breaking the menu code.
+
 2005-06-25  Matthias Clasen  <mclasen@redhat.com>
 
        Add a GrabBroken event to GDK, and a grab-broken-event

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 92c9f63a6a78732a797edd0dbce55e34319b2d54..3d60d3294a7d08419b55a8faf4a09a4fb625f2d2 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -251,9 +251,13 @@ gdk_pointer_grab (GdkWindow *        window,
   if (return_val == GrabSuccess)
     {
       GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
+#if 0
       if (display_x11->pointer_xgrab_window != NULL)
-       generate_grab_broken_event (GDK_WINDOW (display_x11->pointer_xgrab_window),
-                                   FALSE);
+       {
+         generate_grab_broken_event (GDK_WINDOW (display_x11->pointer_xgrab_window),
+                                     FALSE);
+       }
+#endif
 
       display_x11->pointer_xgrab_window = (GdkWindowObject *)window;
       display_x11->pointer_xgrab_serial = serial;
@@ -352,11 +356,13 @@ gdk_keyboard_grab (GdkWindow *       window,
   if (return_val == GrabSuccess)
     {
       GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (gdk_drawable_get_display (window));
-
+#if 0
       if (display_x11->keyboard_xgrab_window != NULL)
-       generate_grab_broken_event (GDK_WINDOW (display_x11->keyboard_xgrab_window),
-                                   TRUE);
-
+       {
+         generate_grab_broken_event (GDK_WINDOW (display_x11->keyboard_xgrab_window),
+                                     TRUE);
+       }
+#endif
       display_x11->keyboard_xgrab_window = (GdkWindowObject *)window;
       display_x11->keyboard_xgrab_serial = serial;
       display_x11->keyboard_xgrab_owner_events = owner_events;